Use qmake patch from upstream

diff --git a/debian/patches/0009-Support-Hurd-in-qmake.patch b/debian/patches/0009-Support-Hurd-in-qmake.patch
deleted file mode 100644 (file)
index b987ca4..0000000
--- a/debian/patches/0009-Support-Hurd-in-qmake.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Mon, 24 Jan 2022 12:00:17 +0100
-Subject: Support Hurd in qmake
-
----
- GPSBabel.pro | 4 ++--
- libusb.pri   | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/GPSBabel.pro b/GPSBabel.pro
-index 98b25c7..2bd178e 100644
---- a/GPSBabel.pro
-+++ b/GPSBabel.pro
-@@ -281,7 +281,7 @@ HEADERS += $$FILTER_HEADERS
- 
- CONFIG(release, debug|release): DEFINES *= NDEBUG
- 
--macx|linux|openbsd {
-+macx|linux|openbsd|hurd {
-   if (equals(MAKEFILE_GENERATOR, XCODE)) {
-     # "Configure tests are not supported with the XCODE Makefile generator"
-     # assume we have the following headers
-@@ -354,7 +354,7 @@ QMAKE_EXTRA_TARGETS += check-vtesto
- QMAKE_CLEAN += $${OUT_PWD}/testo.d/*.vglog
- 
- # build the compilation data base used by clang tools including clang-tidy.
--macx|linux|openbsd{
-+macx|linux|openbsd|hurd {
-   compile_command_database.target = compile_commands.json
-   compile_command_database.commands = $(MAKE) clean; bear $(MAKE)
-   QMAKE_EXTRA_TARGETS += compile_command_database
-diff --git a/libusb.pri b/libusb.pri
-index a6604f9..c66a71e 100644
---- a/libusb.pri
-+++ b/libusb.pri
-@@ -1,7 +1,7 @@
--macx|linux|openbsd {
-+macx|linux|openbsd|hurd {
-   !defined(WITH_LIBUSB, var) {
-     macx: WITH_LIBUSB = included
--    linux|openbsd: WITH_LIBUSB = system
-+    linux|openbsd|hurd: WITH_LIBUSB = system
-   }
-   equals(WITH_LIBUSB, no) {
-     message("libusb-1.0 disabled")
-@@ -14,7 +14,7 @@ macx|linux|openbsd {
-       PKGCONFIG += libusb-1.0
-       DEFINES += LIBUSB_H_INCLUDE=$$shell_quote(<libusb.h>)
-     } else {
--      linux|openbsd {
-+      linux|openbsd|hurd {
-         equals(WITH_LIBUSB, system) {
-           LIBS += "-lusb-1.0"
-           DEFINES += LIBUSB_H_INCLUDE=$$shell_quote(<libusb-1.0/libusb.h>)

diff --git a/debian/patches/831.patch b/debian/patches/831.patch
new file mode 100644 (file)
index 0000000..1ec990f
--- /dev/null
+++ b/debian/patches/831.patch
@@ -0,0 +1,65 @@
+From 60e66d61b2cb9d238f0f6b1088ad7b78f4bc538b Mon Sep 17 00:00:00 2001
+From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
+Date: Mon, 24 Jan 2022 07:09:25 -0700
+Subject: [PATCH] simpify unix world conditionals in qmake files.
+
+---
+ GPSBabel.pro |  4 ++--
+ libusb.pri   | 10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/GPSBabel.pro b/GPSBabel.pro
+index 98b25c7d2..0ee8522d8 100644
+--- a/GPSBabel.pro
++++ b/GPSBabel.pro
+@@ -281,7 +281,7 @@ HEADERS += $$FILTER_HEADERS
+ 
+ CONFIG(release, debug|release): DEFINES *= NDEBUG
+ 
+-macx|linux|openbsd {
++unix {
+   if (equals(MAKEFILE_GENERATOR, XCODE)) {
+     # "Configure tests are not supported with the XCODE Makefile generator"
+     # assume we have the following headers
+@@ -354,7 +354,7 @@ QMAKE_EXTRA_TARGETS += check-vtesto
+ QMAKE_CLEAN += $${OUT_PWD}/testo.d/*.vglog
+ 
+ # build the compilation data base used by clang tools including clang-tidy.
+-macx|linux|openbsd{
++unix {
+   compile_command_database.target = compile_commands.json
+   compile_command_database.commands = $(MAKE) clean; bear $(MAKE)
+   QMAKE_EXTRA_TARGETS += compile_command_database
+diff --git a/libusb.pri b/libusb.pri
+index a6604f94b..9d589001f 100644
+--- a/libusb.pri
++++ b/libusb.pri
+@@ -1,7 +1,7 @@
+-macx|linux|openbsd {
++unix {
+   !defined(WITH_LIBUSB, var) {
+-    macx: WITH_LIBUSB = included
+-    linux|openbsd: WITH_LIBUSB = system
++    mac: WITH_LIBUSB = included
++    !mac: WITH_LIBUSB = system
+   }
+   equals(WITH_LIBUSB, no) {
+     message("libusb-1.0 disabled")
+@@ -14,7 +14,7 @@ macx|linux|openbsd {
+       PKGCONFIG += libusb-1.0
+       DEFINES += LIBUSB_H_INCLUDE=$$shell_quote(<libusb.h>)
+     } else {
+-      linux|openbsd {
++      !mac {
+         equals(WITH_LIBUSB, system) {
+           LIBS += "-lusb-1.0"
+           DEFINES += LIBUSB_H_INCLUDE=$$shell_quote(<libusb-1.0/libusb.h>)
+@@ -27,7 +27,7 @@ macx|linux|openbsd {
+         }
+       }
+ 
+-      macx {
++      mac {
+         equals(WITH_LIBUSB, included) {
+           # TODO: It would be better to create an archive and link to it
+           #       to separate library build requirements from gpsbabel requirements.

diff --git a/debian/patches/series b/debian/patches/series
index 6759ed15fb0577edd16f92fb42c16ad7c7e1029b..49b3f2c60829e157442999b7024a26c3fb341063 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,4 @@ gmapbase.html-location
 Disable-donation-nagging
 0007-Add-workaround-for-failing-test-on-i386.patch
 0008-Add-Debian-build-flags.patch
-0009-Support-Hurd-in-qmake.patch
+831.patch